Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 06.11.24 #652

Merged
merged 5 commits into from
Nov 5, 2024
Merged

Merge upstream 06.11.24 #652

merged 5 commits into from
Nov 5, 2024

Conversation

larentoun
Copy link
Collaborator

@larentoun larentoun commented Nov 5, 2024

About The Pull Request

Там какой-то фиксик

Shadow-Quill and others added 5 commits November 5, 2024 18:00
… or not (tgstation#87522)

## About The Pull Request

Adds a ternary statement to the logging for adding admin remarks (notes,
messages, watchlists) to specify if a note is secret.
No change to actual administrative functions, just the logging.

## Why It's Good For The Game

Accurately reflects the note added!

## Changelog
:cl:
admin: When a secret note is applied, it'll now be logged as a secret
note (instead of appearing like a regular note).
/:cl:
## About The Pull Request

Closes tgstation#87618
Technically either part of this fix (moving the active check in
seal_part and removing the parts check in control_activation) is enough
to fix this particular issue but I'm doing both for sanity reasons (and
possibly edge cases with modules that modify their required parts? not
sure if we have those)

also yeah it didn't call deactivate()

## Changelog
:cl:
fix: Fixed MODsuit deactivation not disabling modules
/:cl:
@github-actions github-actions bot added the 🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов label Nov 5, 2024
@larentoun larentoun merged commit 8163333 into master Nov 5, 2024
22 of 24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🙏 Слияние с восходящим потоком О великий восходящий поток, спасибо что приносишь нам свои дары контента и багфиксов
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants